* doc/lispref/display.texi (Face Functions): `face-list' returns faces.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f469ed3467b778dd6d43beed29fa0eff96f285d2..d1ea1010a4e256e408be4555bc497df541fb98cc 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * display.texi (Face Functions): `face-list' returns faces (bug#9564).
+
 2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * errors.texi (Standard Errors): Remove apparent placeholder text

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 68291319ef154b4a426c3a2b200eceb990f0c418..3002a4c220df4701233a5bee762af79e51ad5980 100644 (file)
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2598,7 +2598,7 @@ attributes @code{nil}.  It does nothing if there is already a face named
 @end defun
 
 @defun face-list
-This function returns a list of all defined face names.
+This function returns a list of all defined faces.
 @end defun
 
 @defun copy-face old-face new-name &optional frame new-frame